Add explicit zlib dependency

Needed for CRC32 computations.

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 241b91d5af2bbcfb940e9867f15cf0b0f58fe7c0..1b265055774e0c6eda35e5dc725a3ced9035020f 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -107,9 +107,9 @@ libostree_1_la_SOURCES += \
 endif
 
 libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \
-       $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS)
+       $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS)
 libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
-libostree_1_la_LIBADD = libotutil.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS)
+libostree_1_la_LIBADD = libotutil.la libglnx.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS)
 
 if USE_LIBARCHIVE
 libostree_1_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)

diff --git a/configure.ac b/configure.ac
index 89eaa39e1d892bb678e9d2fe48ce62d471a27057..f6aeb019ce89d16a14dc9bc2007e8c953a7f0be5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,9 @@ PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
 dnl 5.1.0 is an arbitrary version here
 PKG_CHECK_MODULES(OT_DEP_LZMA, liblzma >= 5.0.5)
 
+dnl Needed for rollsum
+PKG_CHECK_MODULES(OT_DEP_ZLIB, zlib)
+
 dnl We're not actually linking to this, just using the header
 PKG_CHECK_MODULES(OT_DEP_E2P, e2p)